Bug fixes, need sleep!