Bug fixes, removing the need for operations.php