Changed some constant buffer types to match the alignment needed