Bug fixes and added forced octet