Fixed more strict standard warnings and errors