Fixing bugs. :-/