diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
index 94e8090d..7d20c341 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
@@ -45,8 +45,7 @@
  * @notapi
  */
 static __inline void init_board(void) {
-	/* set pin modes in case of defaults by board files have been overwritten */
-	palSetBusMode(GDISP_DATA_PORT, PAL_MODE_OUTPUT_PUSHPULL);
+	palSetGroupMode(GDISP_DATA_PORT, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetPadMode(GDISP_CMD_PORT, GDISP_CS, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetPadMode(GDISP_CMD_PORT, GDISP_RS, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetPadMode(GDISP_CMD_PORT, GDISP_WR, PAL_MODE_OUTPUT_PUSHPULL);
diff --git a/src/touchscreen.c b/src/touchscreen.c
index 14eba4c5..7b562c32 100644
--- a/src/touchscreen.c
+++ b/src/touchscreen.c
@@ -294,7 +294,10 @@ void tsCalibrate(void) {
 	int32_t px, py;
 	uint8_t i, j;
 
+	#if GDISP_NEED_CONTROL
 	gdispSetOrientation(GDISP_ROTATE_0);
+	#endif
+
 	gdispClear(Blue);
 
 	gdispFillStringBox(0, 5, gdispGetWidth(), 30, "Calibration", &fontUI2Double,  White, Blue, justifyCenter);