Fix const warnings
Fix annotation syntax