Warnings and parse fixes