Better fixes for custom annotation scanning