Added fsync settings + some fixes