Small, small changes to fix "bugs"