Bug fixes

Still not working