Fix annotations and controllers