Bug fixes I think...