Replace fixbugs with support annotations

Fix #25