Some fixes and skylab