Fixed issues with annotation loading