Fixes and fcklbj