diff --git a/haskell/src/SEL4/Kernel/BootInfo.lhs b/haskell/src/SEL4/Kernel/BootInfo.lhs
index 58e2e8da8..b22f9bc92 100644
--- a/haskell/src/SEL4/Kernel/BootInfo.lhs
+++ b/haskell/src/SEL4/Kernel/BootInfo.lhs
@@ -1,4 +1,14 @@
-% @LICENSE(OKL_CORE)
+%
+% Copyright 2014, General Dynamics C4 Systems
+%
+% This software may be distributed and modified according to the terms of
+% the GNU General Public License version 2. Note that NO WARRANTY is provided.
+% See "LICENSE_GPLv2.txt" for details.
+%
+% @TAG(GD_GPL)
+%
+
+
 
 This module contains functions that maintaining the bootinfo structure for init-thread .
 
diff --git a/haskell/src/SEL4/Kernel/Init.lhs b/haskell/src/SEL4/Kernel/Init.lhs
index ad6b3a652..4836a205a 100644
--- a/haskell/src/SEL4/Kernel/Init.lhs
+++ b/haskell/src/SEL4/Kernel/Init.lhs
@@ -168,7 +168,7 @@ Set up the kernel's VM environment.
 \end{impdetails}
 
 \begin{impdetails}
-FIX ME: is the follwing still necessary in haskell?
+FIXME: is the follwing still necessary in haskell?
 
 >         initCPU
 >         initPlatform
@@ -267,7 +267,7 @@ Insert thread into rootCNodeCap
 >       return ()
 
 create idle thread and set the Current Thread to Idle Thread
-FIX ME: Seems we need to setCurThread and setSchedulerAction here, otherwise errors raised.
+FIXME: Seems we need to setCurThread and setSchedulerAction here, otherwise errors raised.
 
 > createIdleThread :: KernelInit ()
 > createIdleThread = do
diff --git a/haskell/src/SEL4/Kernel/VSpace/ARM.lhs b/haskell/src/SEL4/Kernel/VSpace/ARM.lhs
index 06917308c..16affb28c 100644
--- a/haskell/src/SEL4/Kernel/VSpace/ARM.lhs
+++ b/haskell/src/SEL4/Kernel/VSpace/ARM.lhs
@@ -113,7 +113,7 @@ However we assume that the result of getMemoryRegions is actually [0,1<<24] and
 
 In c-code we need to Detype the armGlobalPagetTable which is c-equvilance to memzero(armKSGlobalPT,1 << PT_SIZE_BITS)
 
-FIX ME: We might still need to map vector table
+FIXME: We might still need to map vector table
 
 >     mapGlobalsFrame
 >     kernelDevices <- doMachineOp getKernelDevices