Finishing last bugs