Compiler warnings about struct initalization fixed