Fix some warnings and indentations