diff --git a/client/main.c b/client/main.c
index 1063755..5a81897 100644
--- a/client/main.c
+++ b/client/main.c
@@ -2077,6 +2077,7 @@ int main(int argc, char *argv[])
 	main_loop = g_main_loop_new(NULL, FALSE);
 	dbus_conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
 
+	setlinebuf(stdout);
 	rl_attempted_completion_function = cmd_completion;
 
 	rl_erase_empty_line = 1;
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 4f51b0d..82de98b 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -1170,7 +1170,7 @@ void avdtp_unref(struct avdtp *session)
 	if (session->ref > 0)
 		return;
 
-	switch(session->state) {
+	switch (session->state) {
 	case AVDTP_SESSION_STATE_CONNECTED:
 		set_disconnect_timer(session);
 		break;