Small fixes for initial arrays